Skip to content

fix: Contact conflict resolution #36019

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
sampaiodiego merged 13 commits into from
May 20, 2025
Merged

fix: Contact conflict resolution #36019

sampaiodiego merged 13 commits into from
May 20, 2025

Conversation

@lucas-a-pelegrino
Copy link
Contributor

@lucas-a-pelegrino lucas-a-pelegrino commented May 16, 2025 •
edited
Loading

Proposed changes (including videos or screenshots)

This PR implements a new endpoint to resolve Livechat Contact's conflicts. The reason for this is to decrease the level of coupling inside the contacts.update endpoint, so specific business rules don't overlap each other.

Issue(s)

CTZ-154

Steps to test or reproduce

  1. Setup a contact with conflicting fields (name, customFields, and/or contactManager);
  2. Go the Contact's Information and resolve the conflicts through the review modal;

Further comments

@dionisio-bot
Copy link
Contributor

dionisio-bot bot commented May 16, 2025 •
edited
Loading

Looks like this PR is ready to merge! 🎉
If you have any trouble, please check the PR guidelines

@changeset-bot
Copy link

changeset-bot bot commented May 16, 2025 •
edited
Loading

🦋 Changeset detected

Latest commit: b5acf0b

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 36 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/rest-typings Patch
@rocket.chat/api-client Patch
@rocket.chat/core-services Patch
@rocket.chat/ddp-client Patch
@rocket.chat/models Patch
@rocket.chat/ui-contexts Patch
@rocket.chat/account-service Patch
@rocket.chat/authorization-service Patch
@rocket.chat/ddp-streamer Patch
@rocket.chat/stream-hub-service Patch
@rocket.chat/omnichannel-services Patch
@rocket.chat/presence Patch
rocketchat-services Patch
@rocket.chat/omnichannel-transcript Patch
@rocket.chat/presence-service Patch
@rocket.chat/queue-worker Patch
@rocket.chat/network-broker Patch
@rocket.chat/livechat Patch
@rocket.chat/mock-providers Patch
@rocket.chat/cron Patch
@rocket.chat/instance-status Patch
@rocket.chat/uikit-playground Patch
@rocket.chat/fuselage-ui-kit Patch
@rocket.chat/gazzodown Patch
@rocket.chat/ui-avatar Patch
@rocket.chat/ui-client Patch
@rocket.chat/ui-video-conf Patch
@rocket.chat/ui-voip Patch
@rocket.chat/web-ui-registration Patch
@rocket.chat/core-typings Patch
@rocket.chat/apps Patch
@rocket.chat/freeswitch Patch
@rocket.chat/model-typings Patch
@rocket.chat/license Patch
@rocket.chat/pdf-worker Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@CLAassistant
Copy link

CLAassistant commented May 16, 2025 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@github-actions
Copy link
Contributor

github-actions bot commented May 16, 2025 •
edited
Loading

PR Preview Action v1.6.1

🚀 View preview at
https://RocketChat.github.io/Rocket.Chat/pr-preview/pr-36019/

Built to branch gh-pages at 2025-05-19 22:39 UTC.
Preview will be ready when the GitHub Pages deployment is complete.

@codecov
Copy link

codecov bot commented May 16, 2025 •
edited
Loading

Codecov Report

Attention: Patch coverage is 91.66667% with 1 line in your changes missing coverage. Please review.

Project coverage is 64.70%. Comparing base (824a953) to head (b5acf0b).
Report is 5 commits behind head on develop.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #36019      +/-   ##
===========================================
- Coverage    64.70%   64.70%   -0.01%     
===========================================
  Files         3107     3108       +1     
  Lines        93087    93098      +11     
  Branches     17740    17773      +33     
===========================================
+ Hits         60232    60237       +5     
  Misses       30068    30068              
- Partials      2787     2793       +6
Flag Coverage Δ
e2e 58.38% <91.66%> (-0.02%) ⬇️
unit 71.46% <ø> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@lucas-a-pelegrino lucas-a-pelegrino added this to the 7.7.0 milestone May 19, 2025
KevLehman
KevLehman requested changes May 19, 2025
View reviewed changes
@lucas-a-pelegrino lucas-a-pelegrino marked this pull request as ready for review May 19, 2025 21:43
@lucas-a-pelegrino lucas-a-pelegrino requested review from a team as code owners May 19, 2025 21:43
@sampaiodiego sampaiodiego added the stat: QA assured Means it has been tested and approved by a company insider label May 20, 2025
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label May 20, 2025
@sampaiodiego sampaiodiego merged commit 6d334f2 into develop May 20, 2025
9 of 10 checks passed
@sampaiodiego sampaiodiego deleted the fix/CTZ-154 branch May 20, 2025 05:07
@rocketchat-github-ci rocketchat-github-ci mentioned this pull request May 20, 2025
Merged
@lucas-a-pelegrino
Copy link
Contributor Author

lucas-a-pelegrino commented Jun 6, 2025

/backport 7.5.2

@dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Jun 6, 2025

Sorry, I couldn't do that backport because of conflicts. Could you please solve them?

you can do so by running the following commands:

git fetch
git checkout backport-7.5.2-36019
git cherry-pick 6d334f21b97f0cb98d9af03be5167ff60198f6c1
// solve the conflict
git push

after that just run /backport 7.5.2 again

@lucas-a-pelegrino
Copy link
Contributor Author

lucas-a-pelegrino commented Jun 6, 2025

/backport 7.5.2

@dionisio-bot dionisio-bot bot mentioned this pull request Jun 6, 2025
Closed
@dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Jun 6, 2025

Pull request #36176 added to Project: "Patch 7.5.2"

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@aleksandernsilva aleksandernsilva aleksandernsilva approved these changes

@sampaiodiego sampaiodiego sampaiodiego approved these changes

@KevLehman KevLehman KevLehman approved these changes

Assignees

No one assigned

Labels

stat: QA assured Means it has been tested and approved by a company insider stat: ready to merge PR tested and approved waiting for merge

Projects

None yet

Milestone

7.7.0

Development

Successfully merging this pull request may close these issues.

6 participants

@lucas-a-pelegrino @CLAassistant @aleksandernsilva @sampaiodiego @KevLehman